gtk/texthandle: Use gtk_text_handle_present() instead of GtkNative

diff --git a/gtk/gtklayoutmanager.c b/gtk/gtklayoutmanager.c
index 483d92ce93571f780348e2b945551a9ef37c93ce..1a7b7afbf615ee0368e594ba30b803894ef82e4a 100644 (file)
--- a/gtk/gtklayoutmanager.c
+++ b/gtk/gtklayoutmanager.c
@@ -78,6 +78,7 @@
 #include "gtkwidgetprivate.h"
 #include "gtknative.h"
 #include "gtkpopover.h"
+#include "gtktexthandleprivate.h"
 
 #ifdef G_ENABLE_DEBUG
 #define LAYOUT_MANAGER_WARN_NOT_IMPLEMENTED(m,method)   G_STMT_START {  \
@@ -366,6 +367,8 @@ allocate_native_children (GtkWidget *widget)
     {
       if (GTK_IS_POPOVER (child))
         gtk_popover_present (GTK_POPOVER (child));
+      else if (GTK_IS_TEXT_HANDLE (child))
+        gtk_text_handle_present (GTK_TEXT_HANDLE (child));
       else if (GTK_IS_NATIVE (child))
         gtk_native_check_resize (GTK_NATIVE (child));
     }

diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 427bb9a891b673148733f38632a6b1ea423b124d..c39e007d614343b7ec6023d27d351379c3d24d33 100644 (file)
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -2465,10 +2465,10 @@ gtk_text_size_allocate (GtkWidget *widget,
     gtk_popover_present (GTK_POPOVER (priv->selection_bubble));
 
   if (priv->text_handles[TEXT_HANDLE_CURSOR])
-    gtk_native_check_resize (GTK_NATIVE (priv->text_handles[TEXT_HANDLE_CURSOR]));
+    gtk_text_handle_present (priv->text_handles[TEXT_HANDLE_CURSOR]);
 
   if (priv->text_handles[TEXT_HANDLE_SELECTION_BOUND])
-    gtk_native_check_resize (GTK_NATIVE (priv->text_handles[TEXT_HANDLE_SELECTION_BOUND]));
+    gtk_text_handle_present (priv->text_handles[TEXT_HANDLE_SELECTION_BOUND]);
 }
 
 static void

diff --git a/gtk/gtktexthandle.c b/gtk/gtktexthandle.c
index 6d800680882a9c1514e3466b564f3dca33da7e95..8d7deddb3e876d9a5eff6e5bfddae033366fa03c 100644 (file)
--- a/gtk/gtktexthandle.c
+++ b/gtk/gtktexthandle.c
@@ -167,8 +167,12 @@ gtk_text_handle_present_surface (GtkTextHandle *handle)
 static void
 gtk_text_handle_native_check_resize (GtkNative *native)
 {
-  GtkTextHandle *handle = GTK_TEXT_HANDLE (native);
-  GtkWidget *widget = GTK_WIDGET (native);
+}
+
+void
+gtk_text_handle_present (GtkTextHandle *handle)
+{
+  GtkWidget *widget = GTK_WIDGET (handle);
 
   if (!_gtk_widget_get_alloc_needed (widget))
     gtk_widget_ensure_allocate (widget);

diff --git a/gtk/gtktexthandleprivate.h b/gtk/gtktexthandleprivate.h
index 0a02eac12e1f4d7c79ad5bd014f076364ec7b2cc..c01fedcd503541b5c0e11e6b3301996601c64943 100644 (file)
--- a/gtk/gtktexthandleprivate.h
+++ b/gtk/gtktexthandleprivate.h
@@ -35,6 +35,8 @@ typedef enum
 
 GtkTextHandle *    gtk_text_handle_new          (GtkWidget             *parent);
 
+void               gtk_text_handle_present      (GtkTextHandle         *handle);
+
 void               gtk_text_handle_set_role (GtkTextHandle     *handle,
                                             GtkTextHandleRole  role);
 GtkTextHandleRole  gtk_text_handle_get_role (GtkTextHandle     *handle);

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 5e263787484c0f9c3cdfe2e16240218a205ba2eb..ce097cb58648d3d70cde1538f4fbb5cd662633ca 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4537,10 +4537,10 @@ gtk_text_view_size_allocate (GtkWidget *widget,
     gtk_popover_present (GTK_POPOVER (priv->popup_menu));
 
   if (priv->text_handles[TEXT_HANDLE_CURSOR])
-    gtk_native_check_resize (GTK_NATIVE (priv->text_handles[TEXT_HANDLE_CURSOR]));
+    gtk_text_handle_present (priv->text_handles[TEXT_HANDLE_CURSOR]);
 
   if (priv->text_handles[TEXT_HANDLE_SELECTION_BOUND])
-    gtk_native_check_resize (GTK_NATIVE (priv->text_handles[TEXT_HANDLE_SELECTION_BOUND]));
+    gtk_text_handle_present (priv->text_handles[TEXT_HANDLE_SELECTION_BOUND]);
 
   if (priv->selection_bubble)
     gtk_popover_present (GTK_POPOVER (priv->selection_bubble));